From: Andrew Cooper Date: Mon, 19 Jan 2015 11:17:24 +0000 (+0100) Subject: x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3912 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https://%22%22/%22http:/www.example.com/cgi/%22https:/%22%22?a=commitdiff_plain;h=2eddc5d2dc18dfc161de7cd578a4be0d3479d9af;p=xen.git x86/minios: remove more vestigial remnants of SUPERVISOR_MODE_KERNEL MiniOS has never advertised support for supervisor_mode_kernel, and the feature was only ever implemented for 32bit Xen. Signed-off-by: Andrew Cooper Acked-by: Samuel Thibault --- diff --git a/extras/mini-os/arch/x86/x86_64.S b/extras/mini-os/arch/x86/x86_64.S index df3469ef43..72921b143a 100644 --- a/extras/mini-os/arch/x86/x86_64.S +++ b/extras/mini-os/arch/x86/x86_64.S @@ -125,13 +125,10 @@ KERNEL_CS_MASK = 0xfc testl $NMI_MASK,2*8(%rsp) jnz 2f - testb $1,(xen_features+XENFEAT_supervisor_mode_kernel) - jnz 1f - /* Direct iret to kernel space. Correct CS and SS. */ orb $3,1*8(%rsp) orb $3,4*8(%rsp) -1: iretq + iretq 2: /* Slow iret via hypervisor. */ andl $~NMI_MASK, 16(%rsp)